From c6a50a819407246e57ca2b3b4c9d49f7ff056d89 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 25 Sep 2006 13:36:00 +0000 Subject: [PATCH] Don't leak the list of children (#357454, Paolo Borelli) 2006-09-25 Matthias Clasen * gtk/gtkuimanager.c (_gtk_menu_is_empty): Don't leak the list of children (#357454, Paolo Borelli) --- ChangeLog | 5 +++++ gtk/gtkuimanager.c | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b35671aa96..a8d7a2a631 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-09-25 Matthias Clasen + + * gtk/gtkuimanager.c (_gtk_menu_is_empty): Don't leak + the list of children (#357454, Paolo Borelli) + 2006-09-25 Michael Natterer * gdk/x11/gdkdisplay-x11.c (gdk_display_x11_finalize): free diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c index 5f82e2b435..8a3685f76e 100644 --- a/gtk/gtkuimanager.c +++ b/gtk/gtkuimanager.c @@ -1941,6 +1941,7 @@ gboolean _gtk_menu_is_empty (GtkWidget *menu) { GList *children, *cur; + gboolean result = TRUE; g_return_val_if_fail (menu == NULL || GTK_IS_MENU (menu), TRUE); @@ -1956,13 +1957,16 @@ _gtk_menu_is_empty (GtkWidget *menu) { if (!GTK_IS_TEAROFF_MENU_ITEM (cur->data) && !g_object_get_data (cur->data, "gtk-empty-menu-item")) - return FALSE; + { + result = FALSE; + break; + } } cur = cur->next; } g_list_free (children); - return TRUE; + return result; } enum { -- 2.30.2